Merge "Mark CarAppContextManager as @hide. am: 724d95ba5f am: b2b40bfd26" into nyc-mr1-dev-plus-aosp