Merge changes from topic "retailDemo" into tm-dev am: ae758aa7a5 am: 0a5d96c9d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071466 Change-Id: Ibdf882be723532dc3f7cbdd33728c4e916b4db2d
This commit is contained in: