Merge changes from topic "embedding_interface_0922" into sc-v2-dev am: 731b8775

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

Change-Id: I9b6e6c68e788d54a4199c556e865669ebcc3a335