Merge "Deprecate the old rebootAndApply API" am: cabef01cb3 am: 7a81aade1d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0418e182285ee86aefcafb8edba7002229dbc5e