Merge "Added limit of descendant amount when adding activity to task" into udc-dev am: 5cde2b96

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



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