Merge changes from topic "reduce11plus28" am: fecbf1994b am: 6e9f3b18ef am: 8e75334e57

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2038647

Change-Id: Ic5c23e44f7213c0ffacc64fdb65b26e544b358b9