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

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

Change-Id: I3fe357fd02fdbc939a27af134d91087330739322