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

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



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