Merge "ANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION" am: 99037347d6 am: d8c4c860ef

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1660499

Change-Id: I6674c7ce8a425e8615a258700702117277103861