Merge "Add more tracing for obtainStyledAttributes" am: 2ef6338351
am: 106905df2e

Change-Id: I8e7a40aab8bdf2e50c741bcad62dc81bc3df88c0