Merge changes from topics "delete_odex", "prof-save" into sc-dev am: c6d4d4c1 am: 1297fa0f am: 219a2426

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

Change-Id: I19bed78b726ed5aaf207640ee86fe6a28c3ba870