Merge "Remove unnecessary clean up of targets" into sc-v2-dev am: e59a4fee am: 02ab472c

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

Change-Id: I62b3e1988d5ac21667913602b34633910d63ea59