Merge "Check the config before moving to restricted bucket on bg restriction"...

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

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

Change-Id: Ie6e0e7c95205811f1c1b7d69137e41a8b38dd443