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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4747808d5087b693d7ba598329f9845bf9769e