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: e7de08a5 am: 3509ab4b

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



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