Merge "Remove *nonpublic_deps which was added pre-Rb announcement." into...

Merge "Remove *nonpublic_deps which was added pre-Rb announcement." into tm-dev am: 0469e1ae am: 4bbaa847

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

Change-Id: I319c0066a3b6b3a860636793384b1a9f38e6c126