Merge "Prevent having empty task added back into TDA" into sc-dev am: f4690485e1

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

Change-Id: I058b42891266a7f8bbe526a1adc5517706823dc1