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: b81a7886 am: 9e3e8e72 am: ccd1d2dc

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



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