Merge "Revert "Add context to customization class constructors"" am: 23b7c01b64 am: dbe2b4be9a

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

Change-Id: I57ffe4591f03f5b0776a163381d09c0ba6b2564d