Merge "Do not use private APIs in unfold module" into tm-qpr-dev am: 7c4a157a am: 8a93b1f3

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



Change-Id: I4c2dce58ba4fc14fc5bf81f825166df44d841673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>