Merge "Fix TestSubscriberDimensionWrite" into rvc-dev am: eac39c521b am: dbcef6a7f7 am: 480e8af651

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887211

Change-Id: I4d52a7e6412c4efc3ef3aad9851e925cc4311fc8