Merge "Check the config before moving to restricted bucket on bg restriction" into tm-dev am: d4937bbc am: bcd4d208

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

Change-Id: I0ec6b4bd348cb963aa882bd84096dc8f48640820