Merge changes from topic "SF_Solution" into tm-dev am: 2a01b66100 am: 7ccfe2b35e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996786 Change-Id: I7c256ea01ea96c61bc18082534d11d190d5cc076
This commit is contained in: