Merge "Prevent optimization of common code between framework/sysui" into tm-dev am: df11d2d5

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

Change-Id: I2266929972ef621a86a035fd568242d00e39aee5