Merge "Cleanup GlobalModule." into tm-dev am: 6584dbb6e6

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

Change-Id: I8e938b9e4490836db948af5626143803bf595c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>