Merge "Remove unnecessary clean up of targets" into sc-v2-dev am: e59a4fee55

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

Change-Id: Idc1a5c4bcd2954f3c38fe6c6bd51cfa1bb7857d9