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

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

Change-Id: Iab9005d2aea37346e42d761925c06a083c51788a