Merge changes from topics "delete_odex", "prof-save" into sc-dev am: c6d4d4c127 am: 05e72743a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981749 Change-Id: I02c86e7c72f9f4ae54aa2146659ee2d1e4b6e36c
This commit is contained in: