Merge "Deprecate the old rebootAndApply API" am: cabef01cb3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17f7c3647ec11d5546c107bd41f35475eeb50405