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