Merge "Remove framework-atb-backward-compatibility" am: 9f82ba21f1 am: 4f48fa4d6f

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

Change-Id: I5a84342d6ae724e23f0e15edd3681ad327cc95fe