Merge "Don't auto move into restricted bucket if there's a recent interaction" into tm-dev am: dc27292b am: e7de08a5 am: 3509ab4b am: a4921dbe

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



Change-Id: I30cb776074dcf30aeb52f2b9db69e5d8ee819fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>