Merge "Don't auto move into restricted bucket if there's a recent interaction"...

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

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



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