[automerger skipped] Merge "Add TestApi to clear organization Id" into...

[automerger skipped] Merge "Add TestApi to clear organization Id" into sc-v2-dev am: 54c399f8 am: a582b7fb -s ours

am skip reason: Merged-In Ice1123744957ab57636ec1d9b0ca60a16c5a93cf with SHA-1 063e1164 is already in history

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

Change-Id: I46aa56c661118519dc3d684875f24ab98395217f