Merge "Add a profile for OTA" am: e797a5c75a am: 270aca8a98 am: 515b4490e2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1914609

Change-Id: Ideb403fbe00233454053641f636253a5566f41c6